[commonmark] make code fences compliant (+ fix 1058) #1387
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…still allowing empty code blocks
…and info string compliant to commonmark
…locks (pass cm example 112)
Feder1co5oave
changed the title
styfle
reviewed
Dec 10, 2018
styfle
reviewed
Dec 10, 2018
styfle
approved these changes
Dec 10, 2018
There was a problem hiding this comment.
This is awesome! I made a suggestion to change the infostring to language but I see now that the spec actually refers to it as info string so I'm okay with either name.
|
@styfle exactly, I changed the wording to better adhere to commonmark, see the paragraph and the examples below example 110. The language is the first word of the info string, which may contain other information. |
|
Fix list updated. |
davisjam
reviewed
Dec 10, 2018
| @@ -91,7 +91,7 @@ block.normal = merge({}, block); | |||
| */ | |||
|
|
|||
| block.gfm = merge({}, block.normal, { | |||
| fences: /^ *(`{3,}|~{3,})[ \.]*(\S+)? *\n([\s\S]*?)\n? *\1 *(?:\n+|$)/, | |||
| fences: /^ {0,3}(`{3,}|~{3,})([^`\n]*)\n(?:|([\s\S]*?)\n)(?: {0,3}\1[~`]* *(?:\n+|$)|$)/, | |||
There was a problem hiding this comment.
This is no more vulnerable than it previously was.
davisjam
reviewed
Dec 10, 2018
UziTech
approved these changes
Dec 10, 2018
This was referenced Aug 30, 2019
This was referenced Oct 26, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Code fences containing a matching fence not on a new line are terminated incorrectly
This gets up to 100% compliance with commonmark fenced code blocks
Test(s) exist to ensure functionality and minimize regression (if no tests added, list tests covering this PR); or,
Draft GitHub release notes have been updated.
CI is green (no forced merge required).
Merge PR